Rewrite to a sphinx project and use unified theme#698
Conversation
4b2fc98 to
af49c3f
Compare
|
I'll keep a list of things I think we could tidy up here as I go along:
|
d351274 to
d4640ba
Compare
This comment was marked as outdated.
This comment was marked as outdated.
|
You will have to pull this change in too after it is merged. FYI |
|
@astropy/astropy-website-maintainers This is now ready for review. |
| sphinx | ||
| myst-parser | ||
| sphinx-design | ||
| astropy-sphinx-theme@git+https://github.com/Cadair/astropy-sphinx-theme@sunpy-astropy-theme |
There was a problem hiding this comment.
We should probably cut a release of astropy-sphinx-theme before merging this PR 😉
There was a problem hiding this comment.
Can you pls cross link PR from that branch here for future reference? Thanks!
There was a problem hiding this comment.
It's in the PR description above.
There was a problem hiding this comment.
Oh right, nevermind. We cannot merge until this is resolved. I better block merge given the approval.
Shouldn't I wait for you to resolve #698 (comment) first? |
No, I don't think so. This PR is not about the theme it's about rewriting the astropy.org site to use sphinx. Comments about the theme should go on the theme PR. |
|
Now for the record: I'm not a maintainer of this repro because I have deep experience with web development, it's because we used to manually update the list of affiliated packages in this repro and I was the affiliated package editor at the time (and are again now, though we know how've a difference mechanism). That said, I'll have a look as soon as I can. |
hamogu
left a comment
There was a problem hiding this comment.
Most of the changes are pretty straightforward changes for html->rst. I'm not saying that to diminish @Cadair 's work (I know it's still a lot of work to do that, but it's not conceptually hard), just to say that the review is basically "it works" and there is no need to review every changed line, because we would not want to include any changes in the wording of individual pages here anyway.
Otherwise, it's a pretty standard setup and I see no problems with it.
| // Quirk to note: the jQuery.getJSON function fails if you open this locally | ||
| // with Chrome, because Chrome thinks local JSON files are unsafe for some | ||
| // reason. Use basically any other modern browser, or it works fine if its | ||
| // actually on the web server even with chrome. |
There was a problem hiding this comment.
Not really important here, since this is just a comment anyway, but I think most modern browsers now refuse to load any local file for security - for testing locally you'll a local web server running for all or most of them.
There was a problem hiding this comment.
yeah this comment is pretty old 😆
I'd like to purge this entire file of js if I have the time.
|
You have to resolve conflict to pick up #699 . Thanks! |
|
Merged in main |
|
Hmm something is wrong.
|
|
Looks like that's a circleci problem, the way that circleci previews somethings doesn't really work properly. If you look at the RTD preview it seems to work. |
|
Thanks for the clarification. I hope you are right... |
|
So this is good to merge or are we waiting on something else? |
There was a problem hiding this comment.
Can you please add comment to explain what this is for, for future reference?
pllim
left a comment
There was a problem hiding this comment.
Also... Don't we also use some sort of banner mechanism here that "talks" with astropy cord RTD, like when we announced the 10k citation stuff. Would that still work?
| sphinx | ||
| myst-parser | ||
| sphinx-design | ||
| astropy-sphinx-theme@git+https://github.com/Cadair/astropy-sphinx-theme@sunpy-astropy-theme |
There was a problem hiding this comment.
Oh right, nevermind. We cannot merge until this is resolved. I better block merge given the approval.
There's a todo list in the OP, but mostly it's blocked on people reviewing / approving / arguing about colours on the theme PR. |
pllim
left a comment
There was a problem hiding this comment.
Waiting for sunpy theme release
Yes, but I should actually make this site display the banner if it's active! |
b122766 to
f18d04b
Compare
|
@eteq I think the latest commit I think there's still some configuration work to be done to make that actions based deployment work (github actions environment etc). |
eteq
left a comment
There was a problem hiding this comment.
I'm generally happy with all of this, but I have a few questions about finalization steps, @Cadair :
- The changes reminded me our release announcements are generally rendered here. I'm not sure how much we're using that in the more recent releases (@astrofrog might know?), but it's possible that some links will be broken by this if e.g. some of them assumed the github url instead of the astropy.org URL?
- @Cadair, I'm not sure what the finalization was you had in mind here as your last few posts suggest different things to me: are you thinking to use the gh-actions build to mirror the RTD build to here and have this remain the "true" version? (which would then require no DNS change I think) Or just have this as an alternative build and still update the DNS to point to RTD?
|
In some out-of-band discussion, @Cadair clarified the answer is that the desired end-state is RTD only. But we want to take a phased approach since we're not sure what all might break in the transition. So the plan is:
I'll do 1/2 momentarily, and then we'll follow up with the rest elsewhere (since this will be merged by then) |
|
I believe I have done step 1, so merging now |
|
One additional step I realized was also needed: disableing the circleci webhook since it's not used post-merge. |
You can see a preview of this here: https://astropy-org--698.org.readthedocs.build/
Fun things to checkout:
I think this is now ready for review, but please confine review to the diff in this PR. i.e. not the theme which should be reviewed here: astropy/astropy-sphinx-theme#48
HTML Pages left to port:
Todo before merge:
Find someone with power to move the astropy.org domain to RTDpunted to laterOther potential improvements: